-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. #23259
[vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. #23259
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/vcpkg-cmake/vcpkg.json
Valid values for the license field can be found in the documentation
@JackBoosY Please remove tag |
…ection # Conflicts: # ports/vcpkg-cmake/vcpkg.json # versions/baseline.json # versions/v-/vcpkg-cmake.json
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 4b766c1cd17205e1b768c4fadfd5f867c1d0510e -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index f31c7a90..3f0c7d21 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -174,7 +174,7 @@
},
"ashes": {
"baseline": "2022-04-03",
- "port-version": 0
+ "port-version": 1
},
"asio": {
"baseline": "1.22.1",
string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug\"") | ||
string(APPEND parallel_configure_contents "${line}\n\n") | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") | ||
z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is in scripts/cmake/vcpkg_configure_cmake, I think we'd better to make a copy instead of calling it here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scripts won't go away due to versioning so that function will always exist.
Will rerun the failed tests. |
Thanks for the improvements! I explicitly checked that there are only additions and things that shouldn't be backcompat issues in the scripts/ ones. |
push
vcpkg_cmake_
stuff to be more up to date tovcpkg_x_cmake
stuff.add triplet variable VCPKG_CMAKE_GENERATOR for people who are brave enough to do that.closes #23248 ?
depends #23846